Auto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 9 Aug 2016 16:25:54 +0000 (09:25 -0700)
committerGitHub <noreply@github.com>
Tue, 9 Aug 2016 16:25:54 +0000 (09:25 -0700)
Update cargo tests in prep for new errors

This updates a couple tests so that we can upgrade rustc to new error format.

r? @alexcrichton


Trivial merge